api/eqpt_views.py

@@ -219,11 +219,13 @@ def get_screen_data(point=None, point_id=None):

                         macid__in=macids,
              

                         status=True,
              

                     ).values('macid', 'temperature', 'updated_at')
              

                -    temperature_logs = {log.get('macid'): log.get('temperature') or get_old_temperature(point.point_id, log.get('macid')) for log in logs}
              

                -    time_logs = {log.get('macid'): tc.local_string(utc_dt=log.get('updated_at'), format='%m-%d %H:%M') for log in logs}
              

                +    temperature_logs = {log.get('macid'): log.get('temperature') for log in logs}
              

                +    time_logs = {log.get('macid'): log.get('updated_at') for log in logs}
              

                 
              

                     ipuis = IsolationPointUserInfo.objects.filter(point_id=point.point_id, status=True).values('pk', 'fields', 'observed_days')
              

                -    ipuis = {info.get('pk'): {'fields': info.get('fields'), 'observed_days': info.get('observed_days')} for info in ipuis}
              

                +    # ipuis = {info.get('pk'): {'fields': info.get('fields'), 'observed_days': info.get('observed_days')} for info in ipuis}
              

                +    ipuis_fields = {info.get('pk'): info.get('fields') for info in ipuis}
              

                +    ipuis_observed_days = {info.get('pk'): info.get('observed_days') for info in ipuis}
              

                 
              

                     total_active_eqpt_num = eqpts.count()
              

                     has_upload_temperature_num = len(temperature_logs)
              
@@ -232,8 +234,8 @@ def get_screen_data(point=None, point_id=None):

                     eqpts = [{**eqpt.screen_data, **{
              

                         'has_upload': eqpt.macid in temperature_logs,
              

                         'temperature': temperature_logs.get(eqpt.macid, 0),
              

                -        'observed_days': ipuis.get(eqpt.ipui_pk, {}).get('observed_days', 0),
              

                -    }, **{field.get('key', ''): field.get('value', '') for field in ipuis.get(eqpt.ipui_pk, {}).get('fields', {})}} for eqpt in eqpts]
              

                +        'observed_days': ipuis_observed_days.get(eqpt.ipui_pk, 0),
              

                +    }, **{field.get('key', ''): field.get('value', '') for field in ipuis_fields.get(eqpt.ipui_pk, {})}} for eqpt in eqpts]
              

                     reminds = [{
              

                         'name': eqpt.get('name'),
              

                         'room': eqpt.get('room'),
              
@@ -256,7 +258,7 @@ def get_screen_data(point=None, point_id=None):

                         'phone': eqpt.get('phone', ''),
              

                         'sex': eqpt.get('sex', ''),
              

                         'age': eqpt.get('age', ''),
              

                -        'temperature': eqpt.get('temperature', ''),
              

                +        'temperature': eqpt.get('temperature', '') or get_old_temperature(eqpt.get('point_id', ''), eqpt.get('macid', '')),
              

                         'status': '已上报' if eqpt.get('temperature') else '未上报',
              

                         'last_report_time': time_logs.get(eqpt.get('macid', ''), '') if eqpt.get('temperature') else eqpt.get('last_submit_at', ''),
              

                         'observed_days': eqpt.get('observed_days', 0),
              

equipment/models.py

@@ -251,6 +251,7 @@ class ThermometerEquipmentInfo(BaseModelMixin):

                     @property
              

                     def screen_data(self):
              

                         return {
              

                +            'point_id': self.point_id,
              

                             'macid': self.macid,
              

                             'remark': self.remark,
              

                             'last_submit_at': tc.local_string(utc_dt=self.last_submit_at, format='%m-%d %H:%M'),
              
@@ -287,6 +288,7 @@ class ThermometerMeasureInfo(BaseModelMixin):

                             'macid': self.macid,
              

                             'sn': self.sn,
              

                             'temperature': self.temperature,
              

                +            'updated_at': tc.local_string(utc_dt=self.updated_at, format='%m-%d %H:%M'),
              

                         }